Small changes and a test