Fix up compiler warning (uninitialised variable).
Some changes to tests with mixed results