Assertions moved out of catch block for expected exception to stop irrelevant
informatino about the originating exception being added to the stack trace
Refactored tests to use expected excpetion, toBeIn, and to use the
factory method expect in the api module
Merge pull request #21 from iain-peddie/refactoring

Refactoring