Incorporated comments review 3105: - Ran Cleanup - Merged properties into a single property as on calling side it is still possible to determine which function was called - Cleaned up src and tests by extracting common knowledge in separate functions - Updated XMLDoc