fix some tests and such