Fixing tests - five still pending.