Improved readability and checkstyle conformance
Added tests for some Exceptions