More tests, some updates.