Delta changes and tests