Tidy up test file
Move test into tests/ dir