Modify Base_Controller_Plugin tests to reflect class architecture changes