Added a few more modules, and the test for the DFF