update tests and plural.