more acceptance tests, some stuff for implemented