Added a few classes for thee mbdedding test