Improving test to not depend on os environ vars