Updated tests:

Down to 2,8%/3,5% error