more changes to config and add testsupport