First round of functional tests passing
More functional controllers