Resolved race conditions, solidified/consolidated story convention tests. (fixes #70 - finally!)