Switched methods to public to avoid __call from being called during unit tests...