Updating build file lists for preparetest/clean_folder. More to come.
More cleaning up build file lists