Fixing lockout support +test