Improve some tests. Needs to come up some fancy way to test random data.