Update files and add test cases