Add the ability to multiple test iterations without rebuilding.

Address comments.