CURATOR-79 - Modified exception handling to occur in a single block.
Updated some minor unit test niceties.