Fixed package statement.
Fixed another package statement.
Fixed import statement using old package qualifier.
Fixed import statement using old package qualifier.
Tests: now with variables!