added user tests. edited associations in user model