Improves tests