Updating with test run fixes.