fix code and tests for users-not-null #106