Refact tests, add test data.