Debug added, test removed