First take on a better api for allowing exceptions in the acceptance tests