Merge "(Automated Tests) Added more tests to increase TEM score" into devel/master