Revision to stories and template for test implementations of 2 and 'new'