Cleaned up some test code
Finished unit tests around content service