better indentation and divided tests