Re-organized api controller tests