Proper indentation and some new tests