Fixing controller testing