Add more testings, code coverage: 69%