Fixed Data and Business Service tests. Added required model.