* added tests for users and minor refactor * fix helpers * addressed PR feedback * remove before await * missed the await