Added auto tests for this.