Merged latest test cases from main repo