All unit and acceptance tests from ac49972