Remove test for self.q
Update single run to use MP class