Test refactor

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