properly load test env via Bundler, minor fixes [ci skip]