Add in haystack tests