Move tests to real test file