Merge "Add a unit test"