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