Rename testdir and fix indentation