tidy up tests and gonzo