Added 6 more test cases for bugs, 1 more for features.