Removed debugging info; Corrected tests