Adds a test-data generator. Makes some small tweaks with parameters.