More controller testing (mostly pending- todo tomorrow)