getting some thigns under test

Signed-off-by: Chris Jones <chris@jonezy.org>
cleanup before merge

Signed-off-by: Chris Jones <chris@jonezy.org>
Merge branch 'tests'