Adjusted tests to new data and tweaked data.