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