Removed concept 'Environment'
Added switching on arbitrary conditions
Moved test support file
Tweaks to switch tests