cleaning up unit tests to reflect our new safe default value handling