tidy up
adding tests