minor changes in code and tests