Fixed bugs exposed when self-testing

Almost all acceptance tests can be self-hosted