LPS-33427 Added tests again