Unit test fixes.
Corrected service ordering.