Merge "Add a hacking check to block scenario manager in api tests"