Tidy up and add new (not yet implemented) test