Added some test changes