Merge pull request #78 from eric-wu/upgrade

More perf testing
Merge pull request #79 from eric-wu/upgrade

Fix test