Modified generic test