Add test's for all public func's