Fix state tests a little