Added non-locking implementation and Api tests for it + refactored ApiTester