Move matchers up to file scope
Extra test case for block comments