Make tests more solid