resolve compilation issues and test failures