adjust tests to new fixtures