eliminate all-zero case
more test and eliminated all-zero
Merge branch '0525'

Conflicts:
	verification/tests.py
merge fix