Updated data and the tests for more accurate results