REPORTS-220: Changed test cases to mirror added concepts
REPORTS-220: Added unit tests for additional concepts
merging with ojwanganto REPORTS-220C