Merge "Adding Automated tests for text-controller.cpp" into devel/master