Fix some minor leftover changes to existing tests/test setup