fixes from tests for non-1 values