Updated the unit tests and removed synchronized