Started adding Integration tests