do TODO, fixing failing test