Re-factor acceptance spec