FIX: Better testing support