Made isTokenSupported method private
Code style fix
Added test cases for listeners