Added a test or two