Update tests to extend test cover by coverage