further changes required to get doj running
added spy mocking and assertion, converted more tests to doh