Changes to clj test. Will deprecate soon.
Refactor CFD data generation to class method