Tidy up & more tests