removed repetitious code in tests