updated story tests broken
merged in changes and made test output more reasonable stuff