Adjust tests to db changes