Add some tests based on coverage report: Part 1 (#373) * Add some tests based on coverage report * Fix lint