made controllers thin
fixed tests