fix tests
Merge branch 'amendments_to_attempts' into staging