Redid the tests to minimize loop overhead.
Updated according to improved tests.