@flaviogranero's test fixes