finished porting analytic tests