Increase testing coverage