Tests working again. Pre-threaded testing
Tests still not working. Race condition in threaded implementation.