Rearranged buttons on test control panel and added rerun-clean