added better testing