Small restructure..More gtests