Fixed an issue with the new auto-op/deop test feature