merger from Kaltura and some improvements in tests and parameters loading