Remote more test code