Increase coverage of unit tests