several changes, including new test class