Add plant composition classes and tests