test: refactor integration tests, pass 2

Signed-off-by: diditclear <didyourupgradeclear@gmail.com>