adding spec tests to story
fix conflict