Update classmethod first params to cls (standard naming), fix spelling, allow unit tests to pass