Update unit tests for #1332