CRATEIT-209: Adds additional automated tests
Merge branch 'crateit-209'