Fix tests
Fix helpers