Adding unit tests. Converting methods/properties to private.