Test writing week

A lot of fixes for acceptance tests.