better testing support