Fix remaining base tests
Fix helpers