Updated functional test module to support UserService changes