Refactored some tests, introduced class-level fixtures.
Merge branch 'refactor' into devel