Improved benchmark tests, added ECC.