fixing some tests, in progress