Fixed controllers loader and tests