Fix failing tests caused by alignment.