[WIP]modifying my tests for all stories

@AmrARaouf please review