Refactor sample model to simplify test unification (ISPN-4464)