Added some more tests, most not passing...something wrong with the DAGs