Fix some tests, introduce some other broken ones