Fix tests that are testing obsoleted functionality