Added drop and rename tests (TODO: fix the locking)