Add more tests and update forbidden names