Update regular expressions for indentation
Add testcases