Added *or_die functions, update config test.