Hopefully fix the unit tests

TODO make tests work with the new nn parser