Wip acceptance tests

Broken