Get tests sorted, still a bit of a wip.