More testing hooks - breaking things2