Better testing support