Unit test this class
Unit test the concurrent implementation, and implemented some fixes from it