Add tests and crank up number of iterations