Created better testing functionality