Rename config
Add comments to test cases