Fix tests failing with weird names and test isolation