Fixing some more symbol issues.
Some changes in the tests.