Move tests for a separate test file