CDE-243 - Adding unit tests
CDE-243 - Applying checkstyle