Changed the implements on recommendation of yui

Also changed back change to testsuite