Fix returing maps and slices; tests