fixed some tests that had become broken and improved others