Merge pull request #26 from dubdabasoduba/feature/EMR-7

Adding test classes