Minor changes
Fix tests output on 32-bit systems