Fixed unit tests for the padding changes