Wip/h3nk3 failing tests