Update Component.java, update ComponentTest.java