Fix typo in test
Reformat code
Rework configuration to allow defaults to be specified