Fixed tests that relied on old interfaces