Final commit with Test and static.