fixed more issuea ore test coverage