more tests and refactoring

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