Fix helper tests and remove deprecation warnings