Use more helpers in tests