Update test data after 880 and hash key changes
Restructure test cases