only two tests need a fix. Starting to clear deprecation warnings.