silence some deprecation warnings and fixed test for the unit controller