Fix/test and indent