Fixing test controllers