Fix tests, add some stuff.