Fix some more Tests, remove final ints for Difficulty