Removing "static keyword". Fixing test.
4 files changed