moving tests to the right place