Make test more generic