made tests more flexible