Feature/48 improve acceptance tests