-Cleaned up unused properties
-placed a strong key inside the unit tests to allow internals to be visible
-added some better comment documentation