tests passing again, thread safety tests pending