removing some println
removing some println and improving tests