Add some more tests, fix indentation.