added setup_func_test_env
Merge branch 'master' of https://github.com/alistairncoles/keystonev3