Story_115 added a few specs and cleaned up