Got some more tests working, incl the first with moq