Issue refs #1768: fix and pass all tests