Fix other tests