Ugly fix to improve the tests