More unit tests, I think they fail, but I need to go to the other laptop!