small changes and a test