merged all my changes of fixed test cases