More xs and iso tests, also some cleanup in those tests.