Remove usage of options.get_foo()
Remove unused functions from options.
Remove some usages of "with settings"
Use self.component in tests
Improve naming for defs
Merge branch 'feature/simplifydataloading' into develop