Static Analyzer changes, minor test changes