Update test functions and clear new softhsm database location also.
Update test functions and clear new softhsm database location also.

opendnssec/opendnssec-svn,opendnssec/opendnssec-svn,opendnssec/opendnssec-svn,opendnssec/opendnssec-svn