Some more testing and analyzer stuff