Some additional tests and corrections