Added some enum based tests
Merge branches 'master' and 'testCases'