Segregates tests into different files

Line is too long. [89/80]