Fix failing tests since Kepler

Signed-off-by: Fred Bricon <fbricon@gmail.com>