Adding more haiku tests