Add more modelService unit tests. Rename some methods to be clearer.