improve code coverage

improve code coverage
Go ahead. I won't be able to finish it this year.
Maybe start working on #622, you will get a little boost in testing