wip - some ugly test cases
rebase to api changes