removed many warning
accelerating tests