Made test more generic