Remove some printlns in the tests
Cleanup some of the synchronized blocks for slightly better performance