Adding additional state patterns to ensure double stop tests pass