removed console statements, uncommented tests