cleanup of some deprecation warnings in tests