add Hussein Salemwalla's testcases; minor gtest fix