Segregates tests into different files

Use 2 (not -2) spaces for indentation.