refactor tests
Merge branch 'orm-specs' of https://github.com/rhomobile/RMS-Testing into orm-specs