Fixed unittests for #476.