Much better testing, learned how to set up that framework