Add tests for indented syntax and some tweaks