Change ConceptProxy to Concept and rewrite the JUnit tests