Don't treat mocks and spies seperate, retain order. 
Fix Stories to match James' updated style.
New Story/Tests