Continuing work on tests and project config.