More tests and updates