Refactored Test Suite

Completed Service Invoker Test
Refactored Resource History Test