edit stories, refactor tests