Fixed database tests to reflect corrected Grammar classes