moving tests to end of file