updated with Naveeds test case