refactored last model test