Improve HigherOrder test