fix some tests and data