Clean up marker-tests, add undo-test-mark-adjustment