Updated other files to reflect filename chagnes and removed some test variables