Engine tests and some new work on config/system stucture.