More unit testing coverage