cleanup: update test configs (rm redundant one), move MVAs to right folder