Started adding Integration Tests