This could be an EXPECT too, just in case further tests are added in the future. Consistency, IMO. r+ with those changes you should squash the commits and land.