Remove Test Controllers from Git + Factorize code