Add a test
Clean-up tests