Issue #4: Reworked configurator and added new tests.