Define environment in test after environment variables are set
Upgrade catch.hpp to next version