[minor] Added more tests
[fix] Added more tests