Integration testin

WIP