Make tests pass on my machine(s)

The tests still seem weird, especially the updater ones.