Add test module
fixup
wip
wip
wip
wip
wip
wip
wip