Fixed grammar and test naming