Rewrote timing test to be less timing sensitive