Added more tests: coverage nearly equals to 90%.