Remove some useless tests, fixed some singular/plural errors