Renamed components to model
Update tests directory