more changes to Test