Add more testings, code coverage: 71%