The same names can be used now that tests are isolated.
Fix some tests.
Merge branch 'master' into new-types