Simplify existing unit tests.

- Throw unexpected exceptions instead of catching them.
Merge branch 'master' of github:darylseah/K2