More tests updated.