Working on intergration tests