Fixed and expanded grimoire tests.