wrap up cleanup of users module and tests