Wip 7698

I haven't modified the makefile yet to add the unit test to make check