updated tests with proper count and accounting
Updated free tests to use 2 clients
Merge remote-tracking branch 'upstream/master'