More test refactoring (moving test cases to more appropriate classes)