Tests and matches wip
Fix merge issues