updated to merge
enabling color in test/testall.sh