Moved category to separate class
Fixed missing url in call
Added tests