wrapping up http-mock setup; about to merge with master