moving tests to files of their own