Fixed validators in models
Fixed tests to work properly