Now we're actually passing a few unit tests again