Cleaned up runtest.sh, handling of orgs, equates