Split EnvSimple out into its own package
Brought back function test