making tests more robust