Added tests and fixed problems related to pull request  topic/PLAT-6701 #154