Remove the 2 testing classes too