Cleanup test cases and add one for rollover locking