Update unit tests to use newer functions and conventions.