Lots of improvements/bug fixes as a result of new unit test
Adding new unit test
Removing client teset bin
Merge resolution