Fix existing tests for curl, haiku, and notit