Custom merge with tests

Also fixes missing values in config