Added ehvatum's acceptance tests