Refactored tests: moved helper tests to a different class