adjust tests to match new construction procedure