Make slightly better testing