#TPA-1314|Added tests