wip
wip: update tests again, refactor asserts, add client tests
wip