Merge "fix testsuite name bugs and improve some ui details"