silex/testing refactor