Minimised overloaded method signatures. Fixed SystemObject alias in embedded method signatures. Refactored the unit tests.