small fix and wip for test