minor changes in user code and test