working on better testing