Increase coverage of unittests