more unit tests plus component loader fixes