Improving our testing setup, adding validation to models