$1.5 billion for Texas border wall, $800 million for school safety approved by state Senate