Amended tests due to ambiguous match issue with forms
Merge branch 'back-end' of github.com:HatStephens/FATS_Rewardr into back-end