Switch to using compatible cassettes

God I need more tests