Some improvements according the the extra test data