add suppress state transfer tests

Integrated other module and made some little refactoring of common methods we use everywhere