move monkey patching to separate files; hack the raise expectation to work; time to refactor