Fix non-unit tests so they compile again

In addition, I have changed so of the really low-hanging fruit from a "non-unit" to a proper unit test. These may serve as a guide on how to do an easy conversion.