Adding jkunze's acceptance tests