Bills in state Senate would further regulate battery storage and disposal