House, Senate vote for school tax extension