Added some controllers to tests 21, 23