TR-10 checkstyle fix
TR-10 add tests for full coverage