Merge "add test"