Extracted mixins to make tests a bit more extensible. Removed some duplicated code.