FIX: Put test back