Add some tests, populate some data