PMO-2763 Added tests for new functionality