set2, cfd_tests.py passes