Removed unit tests: obviated by service re-design.