clean up deprecated calls in unit tests