eliminate explicit passing of environment and monadic approach,
causes problems for async tests
convert the final set of tests, copy & paste affair