merging all the fixes from warunap repo in tests-samples