Removed mutex. Fixed tests.