Amend tests