Fixed static method handling added static test