More tests.

- Added more tests.
- Added additional config-parameters.