Config changes, work on tests.