Fixing broken tests.  Also fixed problem of  being injected when using a single controller and  is not defined.
Adding in fix for hidden elements due to css attributes.