fix ngo test errors
Merge branch 'master' of https://github.com/mikaelvg/bayanihan