[] Remove deprecated tests and patch up other