Add spring and binstubs to speed up tests