renmaing of fourcolloc to trigcolloc done, tests not modified yet.