More tests and rectifications