Minor changes to Test files