Improve coverage

To improve coverage, I have added test cases and use multi-catch which is supported from Java7.
New coverage report is here: https://coveralls.io/builds/611473