Improve auto indentation, add a few more test cases