restructure acceptance tests