More work on parallel tests