FIX: commented out old tests