Added some additional integration tests