More tests and minor updates.