Failing tests now pass.
Flag test refactor
That's going too far