fix types based on tests