Updated regression test files to clean up and reorganize