Minor changes to Test