Fix acceptance/unit tests