Update tests, add a new test and fix indentation