More test fixes for herosheets refactor