Refactor test to use a model that makes sense conceptually [log skip]