All current tests passing for 2.6 and 2.4