Typo
Refactor default_context_from_params to model
Refactor + comment
Move a block of tests 1 level indent to the right

* this yields an ugly diff message, while it really just adds
  1 level of indent ...