reverting some test changes