Adding back parasol and grid engine tests