Update tests to deal with security enable/disable mechanism