[15] pre-fix refactoring
[15] Changed gateway mock to reproduce issue
[15] Fixed scheduling status
Revert "[1] Fixed scheduling status"

This reverts commit 0e5d2ba225f5d1cf2ce15e447a6922ba5274f046.
Revert "[1] Changed gateway mock to reproduce issue"

This reverts commit cee7810b0dd91dc3ea777ea59025666b1dc43a45.
Revert "[1] pre-fix refactoring"

This reverts commit 735918f660db2b1665add3b39fdaa159b83af8ca.