Fix test failure and prefer compatability with original tape