Test the generic files a bit more thoroughly