Update composer file
Fix artists class name change in test
Move duplicate code from child classes into parent