fix several issues caused by refactoring; tests work again (but only when the components have content