The TestScore and a few eclipse changes