Added some integration tests