Changed some test code