Tidying. Acceptance tests not fully automated though.