fixed failing tests, added some more tests

Signed-off-by: Chris Jones <chris@jonezy.org>
more fixed tests :)

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