modify tests for new models