Added some tests for friendshipcontroller. Added two more tests for friendshipservice. Changed header fragment to eliminate a parse error when running controller tests
Moved methods around in friendshipcontroller, added more tests