Change some tests, break BC