FIX Some tests