-static changes and tests