Change tests to new Spitfire