Refactored test model