update test and fixed controller