Fix bug 3506 and correct typo in test data