Adding long method and static method handling for tests.