Fix merge and add test docs.