Add test for unit merging
Pass any params further
Fix spacing