Amended tests due to ambiguous match issue with forms