Parameter is more specific
Parameter is more specific here too
Updated client unit tests