All tests pass, so add other files back before tracking down offending line