Got rid of the legacy testing code