Issue refs #1768: fix major part of tests