Experimental Study of a Flat Solar Collector with Thermal Energy Storage, Applying Improvements Based on Bibliometric Review and CAD Simulation