Added Story Class and more test cases