fixing tests after structure refactor