Moved features to tests, modified environment to match.

Deal with issue #12