Update tests to reflect changes in the interfaces
Add more docstrings, and some minor tweaks