Some cleanup in the acceptance spec