Moved bundle injection and tests from portlet to core