Fix silex and tests