UnitTests refactored

Major UnitTests refactored,
Minor naming enhancements