Moves complicated tests to their own class and tests