Updating tests to take into account production flag