Merge "Add missing unit test"