Merge 16bit changes and new test cases