Adding better testing.