remove commonModule dependency and added special testing attribute for user model
trivial changes