Client inheritance change
Tests clean up
Readme update