Rework some tests to not be so confusing