Begin fixing controller unit tests