Made approval test more environment agnostic