Minor commit to resolve ClassCastException in some tests