- added tests for Story #2+#3