(finally) Fix some fragile test cases
Merge pull request #60 from Medium/xiao-fix-fragile-timing-test

(finally) fix some fragile test cases
Remove unused code that has issues