Update tests and use generic method for model.
Start adding in Stat state.