added additional tests to cover all data and modified models as needed to pass tests