Wip some tests