extract all defaults into own file and update tests to match