Added tests to confirm the merge