Removing the generic one, adding it as a singlular test