Fix tests
Initial tests of match state prep for frontende