Fix reset and score tests