Add more subcontroller tests