Fix test dependant on classes and null objects

In some situations the model might be null, it should be checked for
The no-data class was needed when there is no-data.