Removed debugging statements, fixed failing tests