Added more tests for ErrorT generation
Merge branch 'master' into dev