test model improvements