Fixed Company Entity and Company Command, added constructor converter, fixed and added unit tests.