Fixed documentation and default test suite to use correct regular
expressions