Added unit test option that is off by default.