fixing broken tests

removed and fixed various locking schemes, etc.
and the rest of the prior changeset :)