LPS-36313 Solve schedule journal tests

I'm sending you this pull directly as it is blocking Beta2.

First three commits have been reviewed and approved by @sergiogonzalez. Last two commits, contains suggestions made by him.

Please review it

Thanks!