Fix acceptance tests, clean up docstrings