Issue refs #1768: fixed and passed core tests