re-orgnize testclass in file