Fix code to remove test changes