Clean up of tests, dtopo1 not passing (barely)