Added company table etc and tests