remove debug logs
improve tests