Move test back to Generic now it's fixed the right way (thanks Eric!)