Quick style update

Signed-off-by: Alan Gardner <alan@armoin.com>
Refactoring test setup

Signed-off-by: Alan Gardner <alan@armoin.com>