Update tests, other small things.