Modified for 1.8.6.17. Some expected changed to expectedAndCode