Remove unused files and change BaseTest to System_BaseTest