Updated tests, looking at getting back into this.