Making Company and Payment models and initial tests work