Bugfix. Need to be classmethod
Cleanup
Added extra test