Unittests and most acceptance tests are now working