Minor updates, prep some test data.