Remove format, fix test helper properly