make test more generic
merge test