Fixed tests and some more indentation