fixed artist issue and added more tests