Changes to deliver

Changes to deliver with two test files.