Refactor stubs to match the latest master

Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>