-- changing to use ULL in test numbers so this compiles on all platforms (fixes issue #1334) -- updating a couple of test-cases/comments to bring inline with Java