adding in better testing