removing Catch 1
removing Catch 2
switched to googlemock for mocking