Added 6 more tests