SH: one bug fixed, 2 Bugs in test:functional