Added Integration tests. Split in new packages