Fixed artist model
Merged tests from jack-dev