Remove use of deprecated test bases and try to get new test to fail correctly.