Made BlockTest better