Added initial keyword support
Changed FIXMEs to TODOs for consistency
Removed quotes
Updated test case
Added auto-generated checks
Added test case to list
Updated test case (still broken)