More acceptance tests + minor fixes