Rework our test includes...tests pass

Crap, cool.