Refactor to test against default values