Removed lock operation, added additional test stubs