Updated tests, moved ConfigFileReader to fix build.