added testsuite, refined list a little