EAGLESIX-2651: Compare: missed test, reduce deviations w/ 2.6.5 code, simplified tests a bit, minor formatting