Added a test suite for the restclient coverage, fixed a few small issues