> I am not sure how the overrides work in this case, but a test fails.

Can't reproduce :-( Just applied the diff to master and `mvn clean test` passes. Which tests should I be running - could you add a stacktrace of the failing test?