Tests passing
Fixes rst errors