Divided tests and fixed last test