Fixed missing self to static conversion
Added unit tests