Add natural user tests
Add tests of new functionality