Move tests
Code cleanup