cleans up main-test.cc somewhat + changes to 2d-mesh