* Fixed tests
 * Expanded test-set to test for adherence to configuration-settings.