Further improves tests