Added coverage testing, removed debugging puts