Refactoring SimpleRestClient tests
Reorganized client tests.  Added API unit tests
Added new tests to build batch