made tests more generic