Moved features to tests, modified environment to match.

Fixes #12