renaming, adding tests, updating docs