moar fix attempts using class lock
fixes so we can execute some tests on its own