Remove additions that crept in and fix small bug in test.