Danliu/testcleanup

reorganize/regrouping of the test files, plus some minor test updates