Make native methods static; add more tests.