Added comments for private methods
Added tests for checking exceptions