WIP - tests
FIXUP - ouch
WIP - tests