First steps in making all unit tests work