hotfix - unbreak claim + some initial incomplete tests for it