Fix helper tests