more acceptance tests, fixed more from the setup