Developing And Assessing Research-Based Tools For Teaching Quantum Mechanics And Thermodynamics