moves tests to proper place