Improved test cases to use analysis base classes.