Progress on tests and static defaults
Changed method param