Minimal changes, new test added