* Minor fix for tests
* Improved test mocks somewhat, but they still need some attention