fixing many tests