Remanufacturing CFDbTest 2.1 produced significant changes and fixes