Separate test case into own module
Move code around