Updated core tests for the changes to 2.3.2