This test is now out of date -- I'll go through the rest and tweak them to match the new expected behavior