model change
fix unit tests