converted expectedException declarations
added createMock helper method
refactored helper method into a Helper class