test fixes
Merge pull request #697 from onepercentclub/feature/CLUB-632

test fixes