Small test changes.
Added back missing files.