Merge of topotools branch and aux copy branch

Tests should now work on this branch too (hopefully).