Fix tests and related functionality
Add features to README