A few missing Lockable-vs-UKV in optional tests