Merging long-long vs unsigned-long-long fixes and test cases