Common unit tests

* Still have some work to do to get them all in line