Fix minor doc bug
Add features and tests subpackages to setup.py
Revert 7ea6