Complete rerfactoring of the UnitTests