Merge + tests