Cleaning up - added a test