Oct8 fix smoke test

all mapping/unmapping test scripts passed in local environment but fail in grc-test so increase timing, and also taking into consideration of database difference.