Prepare to reuse test for more cases
Split test for reuse
Add test that injected environment variable is not honored

Warning - may also be that I've not understood the correct way to 
use injected environment variables.
Style improvements
Fix compilation
Remove debugging println output from assertion test functions
Improve variable name in assert method