Clean up
Change test dir