Modify and move api controller tests